auto merge of #585 : alexcrichton/cargo/update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 17 Sep 2014 13:55:31 +0000 (13:55 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Sep 2014 13:55:31 +0000 (13:55 +0000)

Trivial merge